From 33809c430ffc1de99ff0cbb05c0633595cd98538 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 5 Aug 2013 03:02:23 +0000 Subject: [PATCH] Reconcile merge conflicts from before. Oops. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4507 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/humminbird.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gpsbabel/humminbird.cc b/gpsbabel/humminbird.cc index 8fc8c0fb0..d29af4a3a 100644 --- a/gpsbabel/humminbird.cc +++ b/gpsbabel/humminbird.cc @@ -139,22 +139,22 @@ typedef struct humminbird_trk_point_old_s { } humminbird_trk_point_old_t; typedef struct group_header { - gbuint8 status; - gbuint8 icon; - gbuint16 depth; - gbuint32 time; /* a time_t, in UTC */ - gbuint16 parent_idx; - gbuint16 reserved1; - gbuint16 first_body_index; - gbuint16 reserved2; + uint8_t status; + uint8_t icon; + uint16_t depth; + uint32_t time; /* a time_t, in UTC */ + uint16_t parent_idx; + uint16_t reserved1; + uint16_t first_body_index; + uint16_t reserved2; char name[WPT_NAME_LEN]; } group_header_t; typedef struct group_body { - gbuint8 status; - gbuint8 icon; - gbuint16 next_idx; - gbuint16 item[MAX_ITEMS_PER_GROUP]; + uint8_t status; + uint8_t icon; + uint16_t next_idx; + uint16_t item[MAX_ITEMS_PER_GROUP]; } group_body_t; -- 2.30.2